👋 Welcome back jjg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@jonathan-gibbons The following labels will be automatically applied to this pull request:

• compiler
• core-libs
• hotspot-jfr
• javadoc
• kulla
• net
• security
• serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

Webrevs

• 01: Full (7607c21e)
• 00: Full (1413ee26)

Hi @jonathan-gibbons ,

I notice that in the new version dash characters are no longer escaped as \-, do these still display correctly?

Hi @jonathan-gibbons ,

I notice that in the new version dash characters are no longer escaped as \-, do these still display correctly?

Yes, at least in all the files I verified and I have no reason to believe it might be different in any other files.

On a Mac, you can just do man <path-to-file> to render the contents of a troff file. That is how I checked the files that I did.

@jonathan-gibbons this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8297164.CheckManPageOptions
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@jonathan-gibbons This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8297164: Update troff man pages and CheckManPageOptions.java

Reviewed-by: dholmes

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

The diffs are a bit difficult to read but I didn't spot anything obviously wrong with jwebserver. I could see that the new compress option was there in jmod man page too. +1.

/integrate

Going to push as commit 5a45c25.
Since your change was applied there have been 4 commits pushed to the master branch:

• f12710e: 8288047: Accelerate Poly1305 on x86_64 using AVX512 instructions
• cd6a203: 8297348: make CONF=xxx should match if xxx is an exact match
• 817e039: 8297352: configure should check pandoc version
• 15e2e28: 8297353: Regenerated checked-in html files with new pandoc

Your commit was automatically rebased without conflicts.

@jonathan-gibbons Pushed as commit 5a45c25.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.